Exit early in gtk_style_context_update_cache codepaths

If lookup->missing is empty we don't need to continue looking.
We short circuit in several places as this can happen
after iteratively makeign lookup->missing smaller.

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 6f9e758f0d176498655ad52e993fe46947492966..fbf99709508b6026a295e6c066902caccfd4f16a 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1603,6 +1603,9 @@ gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider,
                                ruleset->styles[j].section,
                                ruleset->styles[j].value);
         }
+
+      if (_gtk_bitmask_is_empty (_gtk_css_lookup_get_missing (lookup)))
+        break;
     }
 }
 

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 33776d285c34fb83cfb950f9491de1ab95710a45..c0253a49937b5edea006db78ef7b6da098f3526c 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -2943,6 +2943,9 @@ gtk_style_context_update_cache (GtkStyleContext  *context,
   GHashTableIter iter;
   gpointer key, value;
 
+  if (_gtk_bitmask_is_empty (parent_changes))
+    return;
+
   priv = context->priv;
 
   g_hash_table_iter_init (&iter, priv->style_data);
@@ -2959,7 +2962,8 @@ gtk_style_context_update_cache (GtkStyleContext  *context,
       if (_gtk_bitmask_get (changes, GTK_CSS_PROPERTY_FONT_SIZE))
         changes = _gtk_bitmask_union (changes, data->store->depends_on_font_size);
 
-      build_properties (context, data->store, info, changes);
+      if (!_gtk_bitmask_is_empty (changes))
+       build_properties (context, data->store, info, changes);
 
       _gtk_bitmask_free (changes);
     }